summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscorpion81 <martin.felke@googlemail.com>2023-05-22 16:48:55 +0200
committerGitHub <noreply@github.com>2023-05-22 16:48:55 +0200
commitf8e7b44d2816108ace9e262f5161a98079a4ca7b (patch)
tree5b818f1aa0ce8992bb363d0630f2c05b46f092f9
parentMerge pull request #10392 from danilaml/update-cubeb-again (diff)
downloadyuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.tar
yuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.tar.gz
yuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.tar.bz2
yuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.tar.lz
yuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.tar.xz
yuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.tar.zst
yuzu-f8e7b44d2816108ace9e262f5161a98079a4ca7b.zip
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index f6e6f2736..c0b2b3e17 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -1034,7 +1034,7 @@ void Device::CollectPhysicalMemoryInfo() {
}
const s64 available_memory = static_cast<s64>(device_access_memory - device_initial_usage);
device_access_memory = static_cast<u64>(std::max<s64>(
- std::min<s64>(available_memory - 8_GiB, 4_GiB), static_cast<s64>(local_memory)));
+ std::min<s64>(available_memory - 8_GiB, 4_GiB), std::min<s64>(local_memory, 4_GiB)));
}
void Device::CollectToolingInfo() {